<html>
<body>
This package adds an view for Eclipse CDO 3.0 allowing user interaction during a merge operation.
The user can select or deselect single changes and can resolve conflicts. <br>For a more detailed documentation please see the diploma thesis "Synchronous Collaborative Model Engineering for the Eclipse Modeling Framework" by Thomas Halmetschlager, Vienna University of Technology 
</body>
</html>